merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 15 Feb 2007 21:09:39 +0000 (14:09 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 15 Feb 2007 21:09:39 +0000 (14:09 -0700)

Trivial merge